Add back-end and front-end changes