Fixed what is mandatory in skapadAv and work on AFU