Apdmin improvements