Relationship and container improvements

• Fixes for relationships returning too many records.
• Containers now automatically detected - no longer need to declare in model.