revised namespace; included Common objects