Update with add more features