Several methods added, including save