Changed the way KeyValueObjectMapping is included in project.