Moved the entity checks to a separate ruleset