refactored new commands, adapted to OSGi