Improve function interfaces