Add maker checker support