Added check for ADM class