Improved package config a bit