Refactor Keyword map