Added relationships and tag capabilities