Simplifying matrix config