Fixed Domain Entity and added indexes