Added webapp support