Add basic support for associations