Added Combo property control