changed files to add common class code