Bug fix: Id is now autogenerated