Feature/simplify rest