Update to work with org.apache.spark packages