Updated Firefly core structure