Added support of fill types