Reverted the change from attributes to elements