Added in more features