Make manifest more generic