Changed from a simple string to a selectable list