Added more restriction to options