Adding more and more features