Refactor System requests