Improvements for statements