Minor updates to packaged classes