Add support for extra options