Lots of changes to DAO after Eclipse fail