Improved the keyword system