fix: reworking service conversion