Format + add List<> in entities