Added entity relationships