Adding better support for ercpass.