Refactored save methods