This should make the bundle 1.0 ready!