Added support for latest packages