Renamed type since it was clashing with Type dsl method
Added Attribute helper methods