Add support for relation