Added curie support