admin added, and fix to annex handler