adding labeling module with some changes