Adding the user zap support.