Modified methods when saving client