Added helpers (missing from prev commits)