DAO and service interfaces + refactoring