Backend improvements