Additions to the web plugin. Needs testing.