Reworked pattern data to allow more flexibility