Modernised to use GolgiAbstractService
Merge