Make the new pattern library more modular