Streamline raid fact, simplify raid manifest