Added interfaces into domain model