Performance tuning and add one more hotkey