Add support for different package types