Improved the EditHandler.