Warnings improvment + new functionality