Updated smart interface
Tests
Merge pull request #842 from cyberone-wdp/#825

#842: pull request #825