Added full loop support