Package control better support