Add better option management.