Adding initial manifest support