Updates to support user repositories