Use the new components