Additional changes for #15 and Pentaho plugin integration