More stuff, room config broken because of spring circular dependencies