Added saving data and username