1. Added primitive label support