Back-end improvements