Restored backend from dev branch