Added command argument adapters and their manager