Added better backend structure