Improve responsiveness of Magpie