[SG] Update block layer to use sg helpers