Moved helpers + key for client and server