refactoring of services
Merge remote-tracking branch 'origin/Development' into Astron