Added class constants etc..