Added class constants (warning: wip)