Bug 905112 - Implement Wrapper Factory