More improvements on params