Re-work tweaks, Add Tilapia support