Fixes #1 - Ids are now taken as strings