APIv4 - Add explicit joins