Performance enhancements
Performance enhancements to Rest and file handler.