Other SMART improvements