Added disjoints to entity subclasses