Add support for associative array in options, remove deprecated special case