Refined codes. Bundle activator added.