Helper modifications