Added tags
Fixed configuration