Aligned and updated data
Added main tp class to catch hiera parameters