Adding front-end support