Added special cases for fill attributes