Change syntax again, support for primitive classes