Change handlers
Move call buffer to server