Renaming Add and Remove properties, removing Group utility function
PR feedback