Refactored to remove uid and uuid