Added tag adress
Refactored