Moved to data architecture