IMproved decorator prototype.