Added component assignments and final preparation of data for further use