Add new options and extensibility issue #1