Yeah I think we can keep the current interface but just check for both, would have to update a few call sites