replaced location primitives with wrapper class