Merge "Add properties for Holmes component"