Changes for working with ServletEngine + WebContainer