Added settings + securely storing credentials