Updated to coincide with v0.6.0 release of ATV