Reworking Smack's OSGi service layer and auto-generation added of SCR component files