Fixing room and worker.sql to work with new schema