Improved: More keywords