Keyword entity now properly commented in code
Massive entity work