Adds key based questions instead of grabbing them by index. You can still use the old index based implementation, but it is deprecated and will be removed in a future release.

Also changes some internal code for clarity.