Add helpers to avoid duplication