Added support for 0.9 packaging system