more refactoring towards using fkooman/rest more