Changes now that options are interfaces