Added keywords
Replaced STRING constant