Made changes to domain model classes

Change-Id: I35e88c62b3ff94cf5d0a78d70a7e2a21d4c0d497
Signed-off-by: ramnar <raam.soft@gmail.com>