And some improvements to package config generator