Added support for fill-h and fill-v