Added backwards compatibility functionality. Blargh.