Refactoring to prepare for multipel labels.