Add support for custom options