Removed dependency on PackageLoader
Standartize method names