Add all types of joins
Fix numeric syntax