Adapted to fd-rest-service 0.2.0