MIgrate to 0.7.4