CLI improvements: usability and reflect schema creation