Moved data traits to individual source files