Add loop support