Add more keywords & definitions