Bug 905112 - Wrapper Factory