Added apt commands
Refactored generic service commands