Added lots of features