Improve options/init API
mend