Made options into interfaces