Restructure params and add version