Made Entity object-oriented; dynamic log messages