More functionality to the Crystal Factory