Added drop down list handling