Add join/leave + lock/unlock
Use correct class for setting headers