Made changes to use certificates