Added objects to support fluent mapping