Added multi line statements and others