Updated to work with Symphony 2.5+