Support legacy front-end