Improve JRebirth API quality