Minor tweaks and added more granular description of covered entities