added parts of dao implementation;