Update build and start work on JID changes