Added DAO exception
Dropped some deprecated methods