Improve pattern