Refactor options, add forward/backward mappings