Add option to fs service so that it can be used without base64