Proper packaging and more services