Improved variable handling in OO