Extend options

@netroy could you take a gander?