Added remaining parameter classes