Modified wrappers.