Add bunch of features and modified routes
Add bunch of features and modified routes