Fix data hierarchy and imports