Refined some patterns