Integration interface and class again

I have no idea why it wasn't committed last time...