Integration interface and class again

I have no idea why it wasn't committed last time...
Merge branch 'pers'
Merge branch 'pers'
Fixed minor name issue.
Merge branch 'pers'