Feature/add node api

we can return here to prevent null pointers further on