Simplification
Add hooks for join