Moved helpers to server