Handle crates better