Adding support for empty statement