Improve internal function signature