Change-Id: I9052e703b58e93b639c027521b47f693ae853f6e
also improve the describing data and core params Change-Id: I645444f2a618fdfd40a729e1007c58def24d5ffb