Changed to not break existing API