Added more Interface support

+General fixes