Added config to constructors