code refactoring, converters implementation modification and option chain integration