Improve Rest support