Updating constants and improving keyword match.