Added nameLabel support