These methods are nearly identical with a few changes between them. Can we get them using some more shared code in the next release?