Updated for new rust version