Add in on demand wrapper