Complete overhaul of AVAILmap