Issue11 - Map Object Definition

References #11