Implemented new element types to use encapsulated helpers
Name spacing and name changes