Improved scope, based on PSR-0