Added timberlake support