Added a bunch of features