Commenting Entity annotation, we don't use this code yet