Added namespace to avoid function name conflicts