Fixing update handler callback arguments (also, optional)