Improve helpers