Added new helper classes, and refractory