Correct generic function signatures