move option definition into command classes