Upgraded to support Q2A 1.6.3