Refactored class hierarchy and handling
Removed assert test
Force label to string
More reorganization