Add options for more flexible API