WIP integrate other data types