Schema changes for API 0.6