Moving to API 0.6