Preparation for adding tls.c