Add querying on nested attributes