Updated API's, Tools.cs & Views