Add adapter support, remove console.logs