Update package to be of more easy usage