This is the update for Room Management in Entities