Updates to backend and GUI