Updated to use the new manifest format