Add Class utility and use it for all class definitions