Added optional flag for drop down