Add new options and extensibility #1