Various updates to Pentaho module