Rewrite of refill handler