All data access added. Not tested yet.