Fixed deprecated interfaces

Closes #2