Added backwards-compatible API