New class from refactoring
Further refactoring; AFS command added