Restructuring to only include common elements