Fixed plugin service factory