Various back-end updates