Adding basic support for SMR