Added save methods
Final refactoring