Added Before/After Save methods