Fixed Domain Entity and added indexes
Merge pull request #136 from wshafer/master

Fixed Domain Entity and added indexes
Merge remote-tracking branch 'upstream/master'
Merge