Add common data components