Added some changes in domain 2: using ids and not the concrete objects