Change api to register individual option objects