Working on improvements to the new backend