Added more interfaces
Added more classes