Added support for return statements