Improved keywords
Pattern support