Preparation for back-ended version