[frontend] - First merge with backend