Convert to cli and new schema model