Added roomAssignment everywhere