Add dictionary searching logic, remove separate method