mojo: Update for cast support