Add server org attach detach functionality