WIP: adapt loops to the all new BaseLoop definition