Re-worked for new rufio version