Updated Crate class