Now following Pentaho Coding Standards