Add package support
Resolving merge conflicts