Backend design improved