Primitives class and some enhancements