More configuration and packaging