Support for different final package added.