#6 Added r_osgi features