replaced Entry with User