Add callback instead of overriding save methods in model. Small fixes