Merged in some more app wrappers