Add rate limiter; switch type to output module