Changed primitives to class equivalents