Adding association support
Adding associations