More support for extra packages

Still untested... ;)