Adapting rest to new DAO\'s - CAF-302