Major commit involving several new components