Added better support for new statements