Removed dependency on WebActivatorEx