#23 : Done
#29 : Updated dependencies between domain classes