Some improvements
SOLID command line interface ready