Updated proper WP structure