Second Commit - Support has-many:through, has-one:through