Replace engine field from model based to choice based