Updated samenabling for non-OSGi