Changes for JBMP