Issue #130, edit controller according to the latest database