Backwards compatibility n better integration in WP3.8