Added tags to common role
Cleanup