Added category bits and masks to Entity subclasses