Added interfaces, classes, register window etc.