Updating to get support for .relation classes