Refactored Parametergrid for new data structure