Reworked backend