Polishing the new mab schema module + validation