Add logic for checking run type to client