Add better option binding