added simplified Geometry codes.