Param structs refactoring