Another changes for layer0 flow