simplify function signatures on internal_api