Properly propage client and project