Re-add ability to fetch by ID
Support user specified ids