Added self.cpp and new target.