Added one to one and one to many mappings