Feature/update and add more feature

Update to latest cookbook