Refactor of RLI baseline matrices