- Repository Refactor (Communication Blocks)