Addressing Flexibility Needs in Electricity Markets