Tweaked upstream and added status
Refactor to clarify tag vs key in utils