Making CLI to support both, the old and the new apps API