Post Expansion enhancements