Turned second parameter in constructor into object, preparing for changes