Updated pattern for more consistency