Added lots of new features