Add support for auto height