Fixing entity mapping
Fixing time display