Adding a bit more options to the wrapper.