Some more refactoring. Change a bit the API to labels