added mapping for attributes, toOne and toMany relation