Add Baryon support