Add NGSI9 & NGSI10 decoupling

#### Reviewers ####
@flopezag