* Updated package names
* Removed redundant parameters