Completed Track1 Data Type refactor