Added some wp support.