Added labels handling
Just some formatting...