Added more primitives