Extend keyword map
Update package versions