Added dropdown menu support