Clean up interfaces of update functions