Added IfNull and IfNotNull blocks