Added Craft Class, modified some methods