Implemented changes to support cloudy-ubersmith 0.2.6