Changed the dao, and added primary key with autoincrement