Refactor & downloading in WP client.