Improve PrependHandler