Fixing the expose endpoint