Updated Use-Cases