Refactoring of the taglibrary.