Added flux wrapper (GR-22)