Moved creation of pseudo-clients