Added backwards compatibility