Allow more options to be passed