Extended DAO and DTOs added.