Pods update and other improvements