Feature/normalize data structure