Issue #434 models modification
 Issue #434 views modification
 Issue #434 controller modification