Finalized the type wrapper