Added support for legacy package