Feature/enabled choice