Major backend improvements