Performance Improvements and Thrift Handler