Merging Snap wrapper code and more Snap classes.