Node structure and attributes JPA fixes