Worked on offical tag support for commercial modules instead of guessing by license, thanks to Rob, Tony and Bryan for input