Design and Semantic improvements