Add Moto X and additional features