Refactor methods to use new CraftDoll that was implemented by the library
Fix null at save time and use metrics lite