Fixed broker, new, runs and generic command