Updated package name
Updated the class