Remake, compatibility with Nette 2.0.* and 2.1.*