Updated to work with apx 0.2.0