Refactored taglibs