Various option picker methods now also support indexed types
Added some unit tests (more to follow)