Feature/small backend improvements