Add support for association