NOTASK; little reconstructure and adding new interfaces, classes, annotations