- Update for AS 0.6.1