Changed files from base code