Major changes in all classes, additions of DAO classes