Improvements to how we handle POCO