Added lobby support