Decouple IQueryEntities and ICommandEntities inheritance hierarchy.