Add SSL
Add Refactoring