Rest Controller speed improvement