Added patterns and regex match