ANN part modified, command & facade
Merge with master
Merge branch 'newdb'