Rework of documentation and added tags