Changed some Semantic features