Added check for packages