#1 Optimizations to support REST interface