Added support for self keyword