Optimize Database & Handlers