Move option setting into BS instance