SSP-1942 Fixed Entity annotation and logger