Adding dynamic height support