POD improvements