Changed comparison by hash to comparison by id in manager classes' methods