Added partial CLI based on Schema