improved product assembly on servlet-container change