Added conversion type dropdown to this branch