Updated package with latest changes