Add support of rest_entity