Update to reflect changes made in homer core