*8995* Make submission step subclass options more flexible