Added support for entity categories.
Added support for entity categories - datafiles.
Added support for entity categories - some fixes.
Missed one file.