AftershipService refactoring
Saving correct data on Aftership