Moved system to build DOM