Several packs added. Custom tag refactored.