Patterns improvements