Adding package availability as an argument.
Forgot to add these files for previous commits.