Added interfaces and classes