Add if-with-blocks