Added support for association conditions