Added interfaces to components