Working on mojo integration