Upgraded to work with apx 0.4.0-rc1