Added some interfaces and classes.