Changed options array structure