Modified DAO and some stuff around. Don't remember all changes o_O.