Updated with recent changes from JEBLib