Removed dot for pattern matching - Not working well in production