Switch to options style for callbacks and fix input callback