Switched to new ruby hash syntax
Fixed key name issue with class methods