#386 Simplified join definitions