Moved more stuff to proxy init