Refactored to use label class