Generic helpers added