Added many more features