Changed passing of options to an object to reduce complexity in adding additional options