Modified in update and findBy functions