Made the Fill function extendable