Change: made service non-commonjs