Add by-id to utils