[~TASK] Added more data types