Use Array for options too, some more optimizations