Added backwards compatability until version 2.