Moved mockup generator out from the service