Improve NGSI inititalization