Updated Squib class