Improved decision class