Improve Form and Unit system