Added support for raw statements