MAJ -- Polished the interface