Fix pointers
Improve support pointer
Add relationship types