Shifting things around to support API