Added autoHeight functionality