Simplified components. Removed local references to global objects.