(feat) #4 initial schemantic change