Modified several files to fit with WP3s data structure