Updated to support latest KenyaEMR RC2