Add proxy and supervisor stuff