Improved gestalt support