DAO and templates changes