Embodiments of the present invention disclose a method, computer program product, and system for optimizing execution of a query that includes a JOIN against a system utilizing data relationship concepts. A computer determines whether one or more data structures in JOIN include a parent/child relationship. The one or more data structures can be one or more tables. Responsive to determining that the one or more data structures in JOIN include a parent/child relationship, the computer determines whether the query that includes the JOIN includes a filter applied on one or more data structures in the JOIN with an OR condition between filters. Responsive to determining that the query that includes the JOIN does not include the filter applied on one or more data structures in JOIN with an OR condition between filters, the computer modifies the query that includes the JOIN into a query utilizing relationship constructs.