Added automatic package loading