Updated to use Common class functions