Small repo structure enhancements