Fixed backend + some refactoring