Refactored Room class