Refactored transformers & Setup relationships