Update Context builder

Adding new quantities in metric API