Merged in more appomaticwrappers