Moved Fill type to model