Updated to push Azure connection and updated Context