Moved property utility functions to separate class