Added basic material saving