Added the get_by_id call