Fixed last merge.

Added interfaces