Use trait instead of class for Entity Bridges; add OptionList trait