Updated madapi