Improved the Ease class