Additional entities
Added logging