Added body type to saving