rework for new as-cli structure