Updated server with changed property
Fixed wrong super call
resorted files