Migrate helper methods from HS Note