Add in more features