Refactor internal implemention, find by class