Added height support