Add flexable options support