Implement extend-options