Added ability to pass options