Making manifest more "generic."