Added Id field and changed the way Users are created