v1beta3 Pod refactor