Data Type logic moved to separate project