More DAO and AOP changes