Made Websites plugin more sophisticated