Edy card support

Integrated changes from previous Edy support branch