Updated models to fit all post types.