More backend and some frontend changes