Added 7 more features