Add get_by_id