Added support for package selection
Reformatted code with Resharper