Some backend improvements