SAMR21 Support added