Updated TypedWrapper from other branch