Added entities

Added some other entities as well as setting the ground of dto mapping
and extension pattern
Merge remote-tracking branch 'origin/mercury' into mercury

Solved conflict