Changed DAO Models, added Attachment