Introduce smarter sign management