Improved framework