Added a bunch of features and other supported extras