Added statement type and parameter observation to the statement
Added second pass freemarker builder