Updated files with Underscore and SM ID