Add label override + cleanup