Merge with front-end