Improved Framework