Sorted out command option injection point