Fixed application not listing after all-min json
Refactored Application & Client logic