Adding support for 'this' keyword