Added alpha and annealing support