Added interfaces for a few classes