Overall cleaner, Less Server Ressource use Known bug: Label/LabelId does not propperly update
200+ lines abstracted