Find by class internal refactor