Refactoring and adding WP Models