(-) Interface implementation.

Unify agent and manager interface. Use only one
source.
Merge branch 'master-interface'