Start adding dynamic tag support
Fix the code to use the new tag system