Fixed typehinting for service to work with prefix and suffix parameters