Updated for wrappers