Readd backwards compatibility