emulating composite keys in mapping and relationship
removed todo which is no longer needed