Updated for new packaging format