More changes to Backend implementation