Added Extension class and more Interfaces