Made options functional