Moved Tags to function returning object instead of object directly