The 2007 Formula One calendar is taking shape after Bahrain revealed they will stage the third race, having opened the season this year.