BREAKING: Changed option API