room implementation change