Also added manifest stuff