Move basic data into a single template